--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
Commit 4802bcd829131a3ca60240733bcbf14b7d2c51da
Parents : 6038096
Author : Mark Qvist <bc7291552be7a58f361522990465165c>
Date : 2026-05-02T22:50:20+02:00
Added basic view/fetch/push stats to rngit
Changes
2 files changed, 152 insertions(+), 1 deletions(-)
Diff
diff --git a/RNS/Utilities/rngit/pages.py b/RNS/Utilities/rngit/pages.py
index 71df3dd4..7adcc0be 100644
--- a/RNS/Utilities/rngit/pages.py
+++ b/RNS/Utilities/rngit/pages.py
@@ -244,6 +244,7 @@ class NomadNetworkNode():
link = self.m_link(f" {self.mdc.BULLET} {group_name}", self.PATH_GROUP, g=group_name)
content_parts.append(f"{link} ({repo_count} {repo_word})\n")
+ self.owner.view_succeeded(None, None, remote_identity)
page_content = "".join(content_parts)
nav_content = "".join(nav_parts)
return self.render_template(page_content, nav_content=nav_content, template="front", st=st)
@@ -285,6 +286,7 @@ class NomadNetworkNode():
if description: content_parts.append(f" - {description}\n")
else: content_parts.append("\n")
+ self.owner.view_succeeded(group_name, None, remote_identity)
page_content = "".join(content_parts)
nav_content = "".join(nav_parts)
return self.render_template(page_content, nav_content=nav_content, template="group", st=st)
@@ -356,6 +358,7 @@ class NomadNetworkNode():
content_parts.append("\n")
+ self.owner.view_succeeded(group_name, repo_name, remote_identity)
page_content = "".join(content_parts)
nav_content = "".join(nav_parts)
return self.render_template(page_content, nav_content=nav_content, st=st)
@@ -494,6 +497,7 @@ class NomadNetworkNode():
if content_parts[-1] == "\n": content_parts[-1] = ""
+ self.owner.view_succeeded(group_name, repo_name, remote_identity)
page_content = "".join(content_parts)
nav_content = "".join(nav_parts)
return self.render_template(page_content, nav_content=nav_content, st=st)
@@ -583,6 +587,7 @@ class NomadNetworkNode():
else:
content_parts.append("Error reading file content.\n")
+ self.owner.view_succeeded(group_name, repo_name, remote_identity)
page_content = "".join(content_parts)
nav_content = "".join(nav_parts)
return self.render_template(page_content, nav_content=nav_content, st=st)
@@ -664,6 +669,7 @@ class NomadNetworkNode():
if has_more: nav_links.append(self.m_link("Older »", self.PATH_COMMITS, g=group_name, r=repo_name, ref=ref, path=file_path, page=page_num + 1))
content_parts.append(" | ".join(nav_links) + "\n")
+ self.owner.view_succeeded(group_name, repo_name, remote_identity)
page_content = "".join(content_parts)
nav_content = "".join(nav_parts)
return self.render_template(page_content, nav_content=nav_content, st=st)
@@ -797,6 +803,7 @@ class NomadNetworkNode():
formatted_diff = self.format_diff(commit_info["diff"])
content_parts.append(f"{formatted_diff.lstrip()}")
+ self.owner.view_succeeded(group_name, repo_name, remote_identity)
page_content = "".join(content_parts)
return self.render_template(page_content, nav_content=nav_content, st=st)
@@ -898,6 +905,7 @@ class NomadNetworkNode():
if (show_heads and not refs_data.get("heads")) and (show_tags and not refs_data.get("tags")):
content_parts.append("No refs found in this repository.\n")
+ self.owner.view_succeeded(group_name, repo_name, remote_identity)
page_content = "".join(content_parts).rstrip()+"\n"
return self.render_template(page_content, nav_content=nav_content, st=st)
diff --git a/RNS/Utilities/rngit/server.py b/RNS/Utilities/rngit/server.py
index 05a0cdab..1f47b112 100644
--- a/RNS/Utilities/rngit/server.py
+++ b/RNS/Utilities/rngit/server.py
@@ -42,6 +42,7 @@ from RNS._version import __version__
from RNS.Utilities.rngit import APP_NAME
from RNS.Utilities.rngit.pages import NomadNetworkNode
from RNS.vendor.configobj import ConfigObj
+from RNS.vendor import umsgpack as mp
def program_setup(configdir, rnsconfigdir=None, verbosity=0, quietness=0, service=False, interactive=False, print_identity=False):
targetverbosity = verbosity-quietness
@@ -135,11 +136,16 @@ class ReticulumGitNode():
self.groups = {}
self.active_links = {}
self.page_servers = {}
+ self.stats = {}
self.last_announce = 0
self.announce_interval = 0
+ self.stats_enabled = True
+ self.stats_job_interval = 15 # TODO: Increase significantly
+ self.last_stats_job = time.time()
self.link_clean_interval = 5
self.last_link_clean = 0
self.active_links_lock = Lock()
+ self.stats_lock = Lock()
self.node_name = "Anonymous Git Node"
self.config = None
@@ -162,6 +168,7 @@ class ReticulumGitNode():
RNS.logfile = self.configdir+"/server_log"
self.configpath = self.configdir+"/config"
self.identitypath = self.configdir+"/repositories_identity"
+ self.statspath = self.configdir+"/stats"
if os.path.isfile(self.configpath):
try: self.config = ConfigObj(self.configpath)
@@ -177,6 +184,7 @@ class ReticulumGitNode():
exit(1)
self.__apply_config()
+ self.__load_stats()
if print_identity:
client_identity_path = self.configdir+"/client_identity"
@@ -211,6 +219,25 @@ class ReticulumGitNode():
if not os.path.isdir(self.configdir): os.makedirs(self.configdir)
self.config.write()
+ def __load_stats(self):
+ with self.stats_lock:
+ self.stats = { "pages": {"front": {}}, "groups": {} }
+ if not os.path.isfile(self.statspath):
+ try:
+ with open(self.statspath, "wb") as fh: fh.write(mp.packb(self.stats))
+ except Exception as e: RNS.log(f"Could not persist stats to {self.statspath}: {e}", RNS.LOG_ERROR)
+
+ else:
+ try:
+ with open(self.statspath, "rb") as fh: self.stats = mp.unpackb(fh.read())
+ except Exception as e: RNS.log(f"Could not read stats file {self.statspath}: {e}", RNS.LOG_ERROR)
+
+ def __persist_stats(self):
+ with self.stats_lock:
+ try:
+ with open(self.statspath, "wb") as fh: fh.write(mp.packb(self.stats))
+ except Exception as e: RNS.log(f"Could not write stats file to {self.statspath}: {e}", RNS.LOG_ERROR)
+
def __apply_config(self):
if not os.path.isfile(self.identitypath):
identity = RNS.Identity()
@@ -403,7 +430,13 @@ class ReticulumGitNode():
while self._should_run:
time.sleep(self.JOBS_INTERVAL)
try:
- if self.announce_interval and time.time() > self.last_announce + self.announce_interval: self.announce()
+ if self.announce_interval and time.time() > self.last_announce + self.announce_interval:
+ self.announce()
+
+ if time.time() > self.last_stats_job + self.stats_job_interval:
+ self.__persist_stats()
+ self.last_stats_job = time.time()
+
if time.time() > self.last_link_clean + self.link_clean_interval:
stale_links = []
with self.active_links_lock:
@@ -527,6 +560,9 @@ class ReticulumGitNode():
if unique_lines: output = '\n'.join(unique_lines) + f"\n@{head_ref} HEAD\n"
else: output = f"@{head_ref} HEAD\n"
+ if for_push: self.push_succeeded(group_name, repository_name, remote_identity)
+ else: self.fetch_succeeded(group_name, repository_name, remote_identity)
+
return b"\x00" + output.encode("utf-8")
except Exception as e:
@@ -716,6 +752,113 @@ class ReticulumGitNode():
RNS.log(f"Error while handling delete request for {group_name}/{repository_name}: {e}", RNS.LOG_ERROR)
return self.RES_REMOTE_FAIL.to_bytes(1, "big") + str(e).encode("utf-8")
+ def view_succeeded(self, group_name, repository_name, remote_identity):
+ if self.stats_enabled:
+ if group_name == None and repository_name == None: self.record_page_view("front")
+ elif repository_name == None: self.record_group_view(group_name)
+ else: self.record_repository_view(group_name, repository_name)
+
+ def fetch_succeeded(self, group_name, repository_name, remote_identity):
+ if self.stats_enabled:
+ if group_name and repository_name: self.record_fetch(group_name, repository_name)
+
+ def push_succeeded(self, group_name, repository_name, remote_identity):
+ if self.stats_enabled:
+ if group_name and repository_name: self.record_push(group_name, repository_name)
+
+ def _get_day(self):
+ timefmt = "%Y-%m-%d"
+ timestamp = time.localtime(time.time())
+ return time.strftime(timefmt, timestamp)
+
+ def record_page_view(self, page):
+ def job():
+ try:
+ with self.stats_lock:
+ day = self._get_day()
+ if not day in self.stats["pages"]["front"]: self.stats["pages"]["front"][day] = 0
+ self.stats["pages"]["front"][day] += 1
+
+ RNS.log(self.stats) # TODO: Remove
+
+ except Exception as e: RNS.log(f"Error while recording page view stats: {e}", RNS.LOG_ERROR)
+
+ threading.Thread(target=job, daemon=True).start()
+
+ def record_group_view(self, group_name):
+ def job():
+ try:
+ with self.stats_lock:
+ day = self._get_day()
+ if not group_name in self.stats["groups"]: self.stats["groups"][group_name] = {"view": {}, "repositories": {}}
+
+ stats = self.stats["groups"][group_name]["view"]
+ if not day in stats: stats[day] = 0
+ stats[day] += 1
+
+ RNS.log(self.stats) # TODO: Remove
+
+ except Exception as e: RNS.log(f"Error while recording group view stats: {e}", RNS.LOG_ERROR)
+
+ threading.Thread(target=job, daemon=True).start()
+
+ def record_repository_view(self, group_name, repository_name):
+ def job():
+ try:
+ with self.stats_lock:
+ day = self._get_day()
+ if not group_name in self.stats["groups"]: self.stats["groups"][group_name] = {"view": {}, "repositories": {}}
+ repos = self.stats["groups"][group_name]["repositories"]
+ if not repository_name in repos: repos[repository_name] = {"view": {}, "fetch": {}, "push": {}}
+
+ stats = repos[repository_name]["view"]
+ if not day in stats: stats[day] = 0
+ stats[day] += 1
+
+ RNS.log(self.stats) # TODO: Remove
+
+ except Exception as e: RNS.log(f"Error while recording repository view stats: {e}", RNS.LOG_ERROR)
+
+ threading.Thread(target=job, daemon=True).start()
+
+ def record_fetch(self, group_name, repository_name):
+ def job():
+ try:
+ with self.stats_lock:
+ day = self._get_day()
+ if not group_name in self.stats["groups"]: self.stats["groups"][group_name] = {"view": {}, "repositories": {}}
+ repos = self.stats["groups"][group_name]["repositories"]
+ if not repository_name in repos: repos[repository_name] = {"view": {}, "fetch": {}, "push": {}}
+
+ stats = repos[repository_name]["fetch"]
+ if not day in stats: stats[day] = 0
+ stats[day] += 1
+
+ RNS.log(self.stats) # TODO: Remove
+
+ except Exception as e: RNS.log(f"Error while recording fetch stats: {e}", RNS.LOG_ERROR)
+
+ threading.Thread(target=job, daemon=True).start()
+
+ def record_push(self, group_name, repository_name):
+ def job():
+ try:
+ with self.stats_lock:
+ day = self._get_day()
+ if not group_name in self.stats["groups"]: self.stats["groups"][group_name] = {"view": {}, "repositories": {}}
+ repos = self.stats["groups"][group_name]["repositories"]
+ if not repository_name in repos: repos[repository_name] = {"view": {}, "fetch": {}, "push": {}}
+
+ stats = repos[repository_name]["push"]
+ if not day in stats: stats[day] = 0
+ stats[day] += 1
+
+ RNS.log(self.stats) # TODO: Remove
+
+ except Exception as e: RNS.log(f"Error while recording push stats: {e}", RNS.LOG_ERROR)
+
+ threading.Thread(target=job, daemon=True).start()
+
__default_rngit_config__ = '''# This is the default rngit config file.
# You will need to edit it to specify repository locations and
──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────